Use 3-way merge editor to view and edit SVN merge conflicts #1632
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FractalBoy
force-pushed
the
merge-editor
branch
2 times, most recently
from
ab5ec22
to
79075c6
Compare
|
It looks like there was a bunch of outdated stuff causing test failures. I went ahead and resolved all of those issues so that the required checks can pass. |
|
@JohnstonCode any chance you can review this PR? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request implements a command for opening merge conflicts in VSCode's 3-way merge editor.
Currently, this editor is only used by the git extension and the command is technically private (
_open.mergeEditor). However, it works and does the same thing thatcode -mdoes on the command line.If you have a merge conflict and you click it in the list of changes, it will now open this merge editor instead of just opening the file.